From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Jul 2009 01:28:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11437
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c6551fce4d215e188b37ebf46c6419fea4099f96;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0e09ab33c6f..d3b2ed805d9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< ChangeLog
+2009-07-17  Kenichi Handa  <handa@m17n.org>
+
+	* casetab.c (shuffle): Fix the logic of setting up the cycle.
+
 2009-07-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* nsfns.m (Fns_set_alpha): Remove function.